Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed release from main to upcoming branch #7064

Merged
merged 1 commit into from
Nov 18, 2024
Merged

Changed release from main to upcoming branch #7064

merged 1 commit into from
Nov 18, 2024

Conversation

shairez
Copy link
Contributor

@shairez shairez commented Nov 15, 2024 •
edited
Loading

What is it?

  • Infra

Description

We want to make sure that we release only versions that have been tested by our "alpha testers" team.

Currently, releasing from main is problematic, because PRs might get merged between the time we got a 👍 from the testers but before we release, meaing bugs can creep in.

Having a pure upcoming release branch, where everything is being tested from allows us to release fully tested and more stable versions.

The new flow will be:

  1. PRs are merged into main

  2. main is periodically merged into upcoming

  3. A new Versions PR is getting created automatically by changesets against the upcoming branch (instead of main).

  4. When we are ready to cut a release, we ask the alpha testers to test the pkg.pr.new version from the upcoming branch.

  5. After we get the approval that the new version on is checked and verified to be working with multiple projects, we can merge the Vesions PR into the upcoming branch which will kick off the auto release process.

  6. After the release we merge upcoming into main so it'll have the latest released version numbers.

Checklist

@shairez shairez requested review from a team as code owners November 15, 2024 12:14
@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Nov 15, 2024 •
edited
Loading

⚠️ No Changeset found

Latest commit: 6242382

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@pkg-pr-new pkg.pr.new
Copy link

pkg-pr-new bot commented Nov 15, 2024

Open in Stackblitz

npm i https://pkg.pr.new/@builder.io/qwik@7064

npm i https://pkg.pr.new/@builder.io/qwik-city@7064

npm i https://pkg.pr.new/eslint-plugin-qwik@7064

npm i https://pkg.pr.new/create-qwik@7064

commit: 831c84b

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 15, 2024 •
edited
Loading

built with Refined Cloudflare Pages Action

⚡ Cloudflare Pages Deployment

Name Status Preview Last Commit
qwik-docs ✅ Ready (View Log) Visit Preview 831c84b

wmertens
wmertens approved these changes Nov 17, 2024
View reviewed changes
Copy link
Member

@wmertens wmertens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@shairez shairez self-assigned this Nov 18, 2024
@shairez shairez merged commit 6029bbf into main Nov 18, 2024
16 checks passed
@shairez shairez deleted the pr-upcoming branch November 18, 2024 09:52
@shairez shairez mentioned this pull request Nov 18, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wmertens wmertens wmertens approved these changes

Assignees

@shairez shairez

Labels
None yet
Projects
Qwik Development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@shairez @wmertens